[packages_10.03.2] lcd4linux: sync patches with trunk

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30337 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/utils/lcd4linux/patches/100-drv_RouterBoard.patch b/utils/lcd4linux/patches/100-drv_RouterBoard.patch
index 9780f5a..ff9ab27 100644 (file)
--- a/utils/lcd4linux/patches/100-drv_RouterBoard.patch
+++ b/utils/lcd4linux/patches/100-drv_RouterBoard.patch
@@ -1,5 +1,7 @@
---- a/drv_RouterBoard.c
-+++ b/drv_RouterBoard.c
+Index: lcd4linux-847/drv_RouterBoard.c
+===================================================================
+--- lcd4linux-847.orig/drv_RouterBoard.c       2007-12-01 17:15:10.000000000 +0100
++++ lcd4linux-847/drv_RouterBoard.c    2007-12-01 17:15:10.000000000 +0100
 @@ -106,7 +106,7 @@
  #include <string.h>
  #include <errno.h>

diff --git a/utils/lcd4linux/patches/120-remove_parport_outb.patch b/utils/lcd4linux/patches/120-remove_parport_outb.patch
index 68d4bd4..9ae1d0b 100644 (file)
--- a/utils/lcd4linux/patches/120-remove_parport_outb.patch
+++ b/utils/lcd4linux/patches/120-remove_parport_outb.patch
@@ -1,5 +1,7 @@
---- a/drv_generic_parport.c
-+++ b/drv_generic_parport.c
+Index: lcd4linux-847/drv_generic_parport.c
+===================================================================
+--- lcd4linux-847.orig/drv_generic_parport.c   2007-12-01 17:15:10.000000000 +0100
++++ lcd4linux-847/drv_generic_parport.c        2007-12-01 17:15:11.000000000 +0100
 @@ -39,16 +39,6 @@
  #include <sys/stat.h>
  #include <sys/ioctl.h>
@@ -17,9 +19,9 @@
  #if defined (HAVE_LINUX_PARPORT_H) && defined (HAVE_LINUX_PPDEV_H)
  #define WITH_PPDEV
  #include <linux/parport.h>
-@@ -68,6 +58,11 @@
- /* these signals are inverted by hardware on the parallel port */
- #define PARPORT_CONTROL_INVERTED (PARPORT_CONTROL_STROBE | PARPORT_CONTROL_SELECT | PARPORT_CONTROL_AUTOFD)
+@@ -65,6 +55,11 @@
+ #define PARPORT_STATUS_BUSY       0x80
+ #endif
  
 +#ifndef WITH_OUTB
 +#define inb(foo) 0

diff --git a/utils/lcd4linux/patches/140-no_repnop_T6963.patch b/utils/lcd4linux/patches/140-no_repnop_T6963.patch
index 31ac8a5..9c224df 100644 (file)
--- a/utils/lcd4linux/patches/140-no_repnop_T6963.patch
+++ b/utils/lcd4linux/patches/140-no_repnop_T6963.patch
@@ -1,6 +1,8 @@
---- a/drv_T6963.c
-+++ b/drv_T6963.c
-@@ -114,7 +114,9 @@ static void drv_T6_status1(void)
+Index: lcd4linux-847/drv_T6963.c
+===================================================================
+--- lcd4linux-847.orig/drv_T6963.c     2007-12-01 17:15:10.000000000 +0100
++++ lcd4linux-847/drv_T6963.c  2007-12-01 17:15:11.000000000 +0100
+@@ -114,7 +114,9 @@
      /* wait for STA0=1 and STA1=1 */
      n = 0;
      do {
@@ -10,7 +12,7 @@
        if (++n > 1000) {
            debug("hang in status1");
            bug = 1;
-@@ -150,7 +152,9 @@ static void drv_T6_status2(void)
+@@ -150,7 +152,9 @@
      /* wait for STA3=1 */
      n = 0;
      do {

diff --git a/utils/lcd4linux/patches/150-addlibmpdclient.patch b/utils/lcd4linux/patches/150-addlibmpdclient.patch
index 0e51f67..7e0c2b2 100644 (file)
--- a/utils/lcd4linux/patches/150-addlibmpdclient.patch
+++ b/utils/lcd4linux/patches/150-addlibmpdclient.patch
@@ -1,5 +1,6 @@
---- /dev/null
-+++ b/libmpdclient.c
+diff -urN lcd4linux-r870.orig/libmpdclient.c lcd4linux-r870/libmpdclient.c
+--- lcd4linux-r870.orig/libmpdclient.c 1970-01-01 01:00:00.000000000 +0100
++++ lcd4linux-r870/libmpdclient.c      2008-03-26 04:43:31.000000000 +0100
 @@ -0,0 +1,1957 @@
 +/* libmpdclient
 +   (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
@@ -1958,8 +1959,9 @@
 +    free(sPlaylist);
 +    free(string);
 +}
---- /dev/null
-+++ b/libmpdclient.h
+diff -urN lcd4linux-r870.orig/libmpdclient.h lcd4linux-r870/libmpdclient.h
+--- lcd4linux-r870.orig/libmpdclient.h 1970-01-01 01:00:00.000000000 +0100
++++ lcd4linux-r870/libmpdclient.h      2008-03-26 04:43:32.000000000 +0100
 @@ -0,0 +1,661 @@
 +/* libmpdclient
 +   (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)

diff --git a/utils/lcd4linux/patches/160-uinput_defs.patch b/utils/lcd4linux/patches/160-uinput_defs.patch
index 44b24b3..5c7b98f 100644 (file)
--- a/utils/lcd4linux/patches/160-uinput_defs.patch
+++ b/utils/lcd4linux/patches/160-uinput_defs.patch
@@ -1,5 +1,6 @@
---- a/drv_G15.c
-+++ b/drv_G15.c
+diff -urN lcd4linux-r877/drv_G15.c lcd4linux-r877.new/drv_G15.c
+--- lcd4linux-r877/drv_G15.c   2008-06-01 22:47:45.000000000 +0200
++++ lcd4linux-r877.new/drv_G15.c       2008-08-06 17:31:04.000000000 +0200
 @@ -42,6 +42,7 @@
  
  #include <usb.h>
@@ -8,7 +9,7 @@
  #include <linux/input.h>
  #include <linux/uinput.h>
  
-@@ -269,8 +270,13 @@ void drv_G15_initKeyHandling(char *devic
+@@ -258,8 +259,13 @@
      }
      memset(&device, 0, sizeof(device));
      strncpy(device.name, "G15 Keys", UINPUT_MAX_NAME_SIZE);

diff --git a/utils/lcd4linux/patches/170-log2f.patch b/utils/lcd4linux/patches/170-log2f.patch
deleted file mode 100644 (file)
index 8f6d861..0000000
--- a/utils/lcd4linux/patches/170-log2f.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugin_netinfo.c
-+++ b/plugin_netinfo.c
-@@ -264,7 +264,7 @@ static void my_netmask_short(RESULT * re
-     sin = get_netmask(arg1);
-     if (NULL != sin) {
-       logval = (long double) (get_netmask(arg1)->sin_addr.s_addr);
--      netlen = (int) rint(log2l(logval) / log2l(2.0));
-+      netlen = (int) rint(log2f(logval) / log2f(2.0));
-       qprintf(value, sizeof(value), "/%d", netlen);
-     } else {
-       qprintf(value, sizeof(value), "/?");